Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 19 Jul 2010 11:26:46 +0000 (11:26 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 19 Jul 2010 11:26:46 +0000 (11:26 +0000)
commitd92399e7739909cd9af04bb8b8b31698a47f5e29
treee3e6d6dbc30fd5ff6ff81cafab65cc7998dc5fa6
parentae879d4f485895452b0dfba1e460db23970fea1d
parent99337df6674fe6dc337fe500089b80f3ef6f462a
Merge from mainline.